diff options
| author | Adam Soltys <[email protected]> | 2023-01-13 23:49:59 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2023-01-13 23:49:59 -0800 |
| commit | 7de4b0d2cd330674dcd02d2b007c1477fd48caaa (patch) | |
| tree | c8721da657a75160c55aaf6bc7cc573669cb52dd /src/routes/(app)/[username] | |
| parent | 75e1e4e6aa2dbc7d400df1860758db28bf44b7a3 (diff) | |
| download | coinos-ui-7de4b0d2cd330674dcd02d2b007c1477fd48caaa.tar.gz coinos-ui-7de4b0d2cd330674dcd02d2b007c1477fd48caaa.zip | |
payments migration
Diffstat (limited to 'src/routes/(app)/[username]')
| -rw-r--r-- | src/routes/(app)/[username]/(profile)/+layout.svelte | 2 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/(profile)/messages/+page.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/dashboard/+page.svelte | 4 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/payments/[...page]/+page.server.js (renamed from src/routes/(app)/[username]/transactions/[...page]/+page.server.js) | 4 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/payments/[...page]/+page.svelte (renamed from src/routes/(app)/[username]/transactions/[...page]/+page.svelte) | 36 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/receive/[...param]/+page.svelte | 7 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/request/+page.svelte | 6 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/request/[id]/+page.svelte | 6 |
8 files changed, 30 insertions, 39 deletions
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte index d76ff065..6528d688 100644 --- a/src/routes/(app)/[username]/(profile)/+layout.svelte +++ b/src/routes/(app)/[username]/(profile)/+layout.svelte @@ -118,7 +118,7 @@ <!-- <button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> --> <!-- <div class="mx-auto flex"> --> <!-- <Icon icon="support" style="mr-1" /> --> - <!-- <div>{$t('transactions.requestAnInvoice')}</div> --> + <!-- <div>{$t('payments.requestAnInvoice')}</div> --> <!-- </div> --> <!-- </button> --> <!-- </a> --> diff --git a/src/routes/(app)/[username]/(profile)/messages/+page.svelte b/src/routes/(app)/[username]/(profile)/messages/+page.svelte index fd12c6bf..47228015 100644 --- a/src/routes/(app)/[username]/(profile)/messages/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/messages/+page.svelte @@ -77,7 +77,7 @@ <div class="container max-w-lg px-4 mx-auto mt-10 space-y-5"> <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold"> - {$t('transactions.sendMessage')} + {$t('payments.sendMessage')} </h1> <div class="max-h-[calc(50vh)] overflow-y-scroll p-4" bind:this={pane}> @@ -105,7 +105,7 @@ <input use:focus name="message" - placeholder={$t('transactions.sendMessage')} + placeholder={$t('payments.sendMessage')} class="w-full p-4 border rounded-xl" bind:value={message} bind:this={input} diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index 86ec5c0e..3779ab2f 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -103,7 +103,7 @@ <!-- <div class="flex"> --> <!-- <Avatar user={recipient} size={20} /> --> <!-- <div class="my-auto text-left"> --> - <!-- <p class="text-secondary">{$t('transactions.invoiceFrom')}</p> --> + <!-- <p class="text-secondary">{$t('payments.invoiceFrom')}</p> --> <!-- <p class="ml-1 text-lg break-words">{recipient.username}</p> --> <!-- </div> --> <!-- </div> --> @@ -111,7 +111,7 @@ <!-- <div class="flex"> --> <!-- <Avatar user={requester} size={20} /> --> <!-- <div class="my-auto text-left"> --> - <!-- <p class="text-secondary">{$t('transactions.awaiting')}</p> --> + <!-- <p class="text-secondary">{$t('payments.awaiting')}</p> --> <!-- <p class="ml-1 text-lg break-words">{requester.username}</p> --> <!-- </div> --> <!-- </div> --> diff --git a/src/routes/(app)/[username]/transactions/[...page]/+page.server.js b/src/routes/(app)/[username]/payments/[...page]/+page.server.js index 6883dfa9..6ced265d 100644 --- a/src/routes/(app)/[username]/transactions/[...page]/+page.server.js +++ b/src/routes/(app)/[username]/payments/[...page]/+page.server.js @@ -17,8 +17,8 @@ export async function load({ cookies, params, request }) { let url = `/payments?v2=true&start=${start * 1000}&limit=${limit}&offset=${offset}`; if (end) url += `&end=${end * 1000}`; - let { total, transactions } = await get(url, auth(cookies)); + let { total, payments } = await get(url, auth(cookies)); let pages = new Array(Math.ceil(total / limit)); - return { total, transactions, page, pages, start, end }; + return { total, payments, page, pages, start, end }; } diff --git a/src/routes/(app)/[username]/transactions/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte index 89207134..4348eb72 100644 --- a/src/routes/(app)/[username]/transactions/[...page]/+page.svelte +++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte @@ -20,10 +20,10 @@ }; let presets = [ - { title: $t('transactions.day'), start: sub(new Date(), { days: 1 }), end: null }, - { title: $t('transactions.week'), start: sub(new Date(), { days: 7 }), end: null }, - { title: $t('transactions.month'), start: sub(new Date(), { months: 1 }), end: null }, - { title: $t('transactions.all'), start: sub(new Date(), { years: 5 }), end: null } + { title: $t('payments.day'), start: sub(new Date(), { days: 1 }), end: null }, + { title: $t('payments.week'), start: sub(new Date(), { days: 7 }), end: null }, + { title: $t('payments.month'), start: sub(new Date(), { months: 1 }), end: null }, + { title: $t('payments.all'), start: sub(new Date(), { years: 5 }), end: null } ]; $: selection = start @@ -32,9 +32,9 @@ let p, total, - transactions = [], + payments = [], pages = []; - $: data && ({ page: p, pages, start, end, total, transactions: $txns } = data); + $: data && ({ page: p, pages, start, end, total, payments: $txns } = data); $: $page && ($newPayment = false); $: $newPayment && invalidate(`/users/${user.username}`); @@ -50,7 +50,7 @@ '\n' + $txns.map((r) => keys.map((k) => `"${r[k]}"`).join(',')).join('\n'); - const filename = 'transactions.csv'; + const filename = 'payments.csv'; let blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' }); if (navigator.msSaveBlob) { navigator.msSaveBlob(blob, filename); @@ -71,7 +71,7 @@ <div class="mt-24 mb-20"> <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10"> - {$t('transactions.header')} + {$t('payments.header')} </h1> <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5"> @@ -80,7 +80,7 @@ {#each presets as { start, end, title }, i} <a class:active={selection === i} - href={`/${user.username}/transactions/${getUnixTime(start) + '/'}1`} + href={`/${user.username}/payments/${getUnixTime(start) + '/'}1`} > <button class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]" @@ -152,16 +152,10 @@ </a> {:else} <div class="text-secondary flex"> - {#if tx.network === 'lightning'} - <div class="text-3xl">⚡️</div> - {:else} - <div class="my-auto mr-1"> - <img src="/images/bitcoin.svg" class="w-12 border-4 border-transparent" /> - </div> - {/if} + <div class="text-3xl">⚡️</div> <div class="my-auto"> - {tx.amount > 0 ? (tx.confirmed ? 'Received' : 'Pending') : 'Sent'} + {tx.amount > 0 ? 'Received' : 'Sent'} </div> </div> {/if} @@ -169,16 +163,16 @@ <div class="text-secondary text-right text-sm my-auto"> <div> - {format(parseISO(tx.createdAt), 'h:mm aaa')} + {format(new Date(tx.created_at), 'h:mm aaa')} </div> <div> - {format(parseISO(tx.createdAt), 'MMM d')} + {format(new Date(tx.created_at), 'MMM d')} </div> </div> </div> </a> {:else} - <p class="text-secondary text-lg text-center">{$t('transactions.empty')}</p> + <p class="text-secondary text-lg text-center">{$t('payments.empty')}</p> {/each} </div> <button @@ -186,7 +180,7 @@ on:click={csv} > <Icon icon="save" style="opacity-50 mr-2 my-auto" /> - <div class="my-auto">{$t('transactions.export')}</div> + <div class="my-auto">{$t('payments.export')}</div> </button> </div> </div> diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte index 4559f00c..18d6b21e 100644 --- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte +++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte @@ -3,7 +3,7 @@ import { t } from '$lib/translations'; import { enhance } from '$app/forms'; import { page } from '$app/stores'; - import { invoices, requestRedirect } from '$lib/store'; + import { requestRedirect } from '$lib/store'; import { browser } from '$app/environment'; import { goto } from '$app/navigation'; @@ -19,9 +19,6 @@ let { currency, username } = data.subject; let { user } = data; - - $: paid = browser && form && Object.values($invoices).find((inv) => inv.amount === form.amount); - $: paid && goto(`/invoice/${paid.id}/paid`); </script> <form method="POST" class="flex justify-center items-center mt-24 mb-3 px-3" use:enhance> @@ -43,7 +40,7 @@ class="bg-black text-white rounded-xl w-full h-[48px] flex justify-center items-center font-semibold opacity-100 hover:opacity-80" > - {amount ? $t('transactions.next') : $t('transactions.sendersChoice')} + {amount ? $t('payments.next') : $t('payments.sendersChoice')} </button> </div> </form> diff --git a/src/routes/(app)/[username]/request/+page.svelte b/src/routes/(app)/[username]/request/+page.svelte index fb3d0599..305cc8fb 100644 --- a/src/routes/(app)/[username]/request/+page.svelte +++ b/src/routes/(app)/[username]/request/+page.svelte @@ -16,7 +16,7 @@ <div class="container max-w-lg px-4 mx-auto mt-10 space-y-5"> <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold"> - {$t('transactions.requestAnInvoice')} + {$t('payments.requestAnInvoice')} </h1> <form action="?/create" method="POST" use:enhance class="space-y-5"> @@ -25,7 +25,7 @@ <textarea name="memo" - placeholder={$t('transactions.describeOrder')} + placeholder={$t('payments.describeOrder')} class="w-full p-4 border rounded-xl h-48" /> @@ -34,7 +34,7 @@ type="submit" class="bg-black text-white border rounded-full px-6 py-2 font-bold mx-auto" > - {$t('transactions.submit')} + {$t('payments.submit')} </button> </div> </form> diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte index 356fd95a..b061886e 100644 --- a/src/routes/(app)/[username]/request/[id]/+page.svelte +++ b/src/routes/(app)/[username]/request/[id]/+page.svelte @@ -21,7 +21,7 @@ <div class="text-center mb-8 space-y-5"> {#if request.recipient_id === user.id} <p class="text-5xl break-words"> - <span class="text-xl md:text-2xl">{$t('transactions.sentInvoiceTo')}</span> + <span class="text-xl md:text-2xl">{$t('payments.sentInvoiceTo')}</span> </p> <div class="flex p-1 gap-2 justify-center"> <Avatar user={request.requester} size={20} /> @@ -35,7 +35,7 @@ </div> {:else} <p class="text-5xl break-words"> - <span class="text-xl md:text-2xl">{$t('transactions.sentRequestTo')}</span> + <span class="text-xl md:text-2xl">{$t('payments.sentRequestTo')}</span> </p> <div class="flex p-1 gap-2 justify-center"> <Avatar user={request.recipient} size={20} /> @@ -49,4 +49,4 @@ <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" /> </a> -<div class="fixed bottom-10 w-full text-center">{$t('transactions.tapAnywhere')}</div> +<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div> |
